Add more Map tests