Started adding tests for the decorators
Working on a reasonable way to test decorators
Fixed decorator tests