(Issue 303) Functionality is there and existing unit tests adjusted. Needs new tests.
(Issue 303) Added unit tests for a variety of combinations of resourceTypes