Moved tests to common tests
Made global options a state variable