modify: user decorator and tests