Refactor option tests
Refactor option tests
Test timelimit