Merge "Fix dependencies in the test suite for multi-target tests"