After removing code with #12 and grouping it with #13, remaining code should be fully tested to ensure correctness.
