Decorator coverage

removed unused decorater functions, and added unit tests to improve code coverage.