Added more tests, fixed broken tests