Better test coverage simplified options

Was able to remove options code, since browsers (mostly) agree that
options don't inherit disabledness