added more tests
edited test