Fixed broken mapping tests