Added yet more tests