Add tests for option groups