tidy warnings and test-ordering brittleness