Changed unit test classes around.