implemented a few more tests