Also fix the name of one test file to match the file name Change-Id: If622e925645cf21bf726f4db0f779182d78bbd73