Moved extras so they don't pollute tests