Merge "Remove redundant 601 test, it's all in 600."