More tests for mapper