Cleanup test a bit