Added test map and updated map loading