Merge "Remove need for check script in test 1937"