Added more tests
...
....