improve test coverage

cc/ @williamboxhall