More changes - tests and structure changes to decorators