Merge "CoreTests: Tidy up legacy tests."