Merge "Replace deprecated test.attr with decorators.attr"