Decorators fixes.
Test suite extended.