Dedupe and move options tests to one place