Skipping options with empty value + tests for this