Still increasing test coverage