Feature/test coverage

Adds 100% test coverage