Added more tests, bumping up the test coverage a little