added more tests
removed garbage