Fix NH-3316

Tests covering NH3316
Fix some other bad unit tests

The problem was that when resolving the parent, it was checking if the propertiesContainerType was a component and returning null if it wasn't, and most of the time it was not. It would only resolve the parent type when using nested components.