Merge "Add legacy-test as replacement for core-junit"