Merge "Actually run `test_skip_attr_*` unit tests"