Add a bunch more tests