Added more tests
Clean commit