Added more tests
Added more tests, for a second time
Added more tests