Added tests for the new options + test refactoring