Added more tests and classes