Update parent to avoid false negatives for test results
Backport additional ctors and methods for locators
Fix version detection so that it does not suppress other resources