- Added unit test to guard against Decorator teardown before init
- Fix code formatting