Add more map variants, more tests

At this point, code_coverage is starting to look pretty good