[Refactoring] deferred is necessary only for nested functions in unittests
Merge pull request #3421 from 9rnsr/refactor_glue

[Refactoring] deferred is necessary only for nested functions in unittests