Merge "Update run-test 031-class-attributes"