More tests
Use an enum to decide how to generate OPs