Merge "Replace test.attr with decorators.attr"