Trivial lame tests, minor changes to MapBuilder interface.