Added a few map tests