updated tests to use new GenericOperation class