updated to updated spec
implemented Decorator and simple test