Tests can test for Map equality now
Bugfixes and improved tests