Add more tests and remove unused classes