Refactor tests, add tests for parsing options with and without quotes