marginal improvements to test framework