Added more tests

everything seems to work