Feature/test coverage