Cleaned up map tests