Map tests now working. Now up to date with main