improve test coverage and helpfulness