tests: minor test clean up