Added more tests
Fixes