minor test suite clean up (more on the way)