Moves the tests and adds new options tests