Laying the groundwork for unit tests.
More prep work for unit tests.