Added more tests, deleted unused files