Moved unit tests into different test classes so that the intent of each test class is clearer