Use comparative test helpers, test one thing, remove dead code.