changes in basemanager, managers and test