MapControl Tests Added and MapControl Fixed