tidy deprecation and test-ordering brittleness