Clean up some tests (per BetterSpecs and etc.)