Fix test else rule
Remove unused mocks
Else integration test now makes use of the general oc integration test