Merge "Move legacy-test to test-base"