Adding a bunch more test coverage