WIP Added more complex examples with maps
Merge branch 'master' into more-complex-test
Fixed new tests calling the wrong method name

And FMT'd