Improve isolation for tests #23
Description
Unit tests currently aren't well isolated or leveraging mocking enough, so issues with other classes could affect the results of the tests.
This is not a high priority at this point, but good to get it on the radar at least.