test fix: added latches to tests with entry listener
test fix: getting instance from test factory
Merge remote-tracking branch 'upstream/maintenance-3.x' into maintenance-3.x