Fixed NPE
Partial body resolve: added two failing tests for bugs in resolve + tests now support resolve to any element with selection in test data