Added more unit test classes