Feature/163 test coverage

Don't pull, just for conversation