Added more tests,