Add a few more tests
Remove substantial duplication from tests