Added more classes to test