Added a bit more complex mapper test