Addition of test code for the map builder among other things that I think are good