minor cleanup to test suite