Added more tests, mostly