Wrap compilationunits in type wrapping the corresponding collection
Implement rule specific integration test
Fix test else rule
Remove unused mocks
Else integration test now makes use of the general oc integration test
Merge branch 'refactoring'