Added more tests\!