Managers and Tests fixed