Added mapping tests