clean up and ease bundling of mapping configurations as single tests