Merge "Fix TestingAccessWrapper private property access and parent classes"