Decorator coverage

removes unused code from decorators file, and adds unit tests over remaining functions.  This was done to increase code coverage.