Remove too-early attempts at bringing test helpers into core