cleaned up; added test
more comprehensive test for Decorator