Adding a bunch more tests.