Added test coverage stuff