Add tests for combo