Cleaned up MapScreen, started MapTesting