Fixed broken tests
Added more tests