Flushed out unit test coverage to 100%