Fixing test managers.
Merge pull request #257 from ngodfraind/fixing-tests

Fixing test managers.