Fixes #153.
unit tests fixes backported from 1.2 branch for issue #236
Updated change log.
Re-added some code that got overwritten in previous commit.
Updated change log.
Refactored syntax.
with this change plugin mixin targetting global will be executed during
the execution of Unit Test. Currently, those global mixin is broken
during Unit Test and the original core methods is being executed
instead.
Merge pull request #252 from scahyono/master-test-mixin-fix

Master test mixin fix
Updated change log
resolve change log merge conflict
Merge pull request #253 from chapmandu/master

Updated change log
Merge pull request #22 from cfwheels/master

pull from upstream