Merge "Make test 968's name shorter"