#4 Added Controller Test and MapTerrainTest