always rerun tests, small cleanup