Added more schema mapping tests