Merge branch 'gt/decorate-unit-test'