added some more tests
merged