added a few more tests now