Adding more tests
remove unneccesary code