Add OPR operations
Update test fixture