Topic/increase test coverage