Added more tests
Fix #22
Fix