Improve tests

(Merge 'pull request' on the mapper first!)

partial update of the tests to work with the new test_config of the mapper