added in some more tests