Changes in MapManagerTest,  syntactic changes in other classes