Merge "fix broken build: renaming a testfile"