Added more classes to unit test