Improve unit-tests of Manager.