Fixed unit test class