fixed map widget tests, commented out map to Control for now