Better test coverage

#1112