a simpleish merge function for maps, and some tests for that
Start using the new map merge function
Reformat, improve the 'Provides()' methods