Tidying up tests for 100% coverage

All tests pass with 100% test coverage