Updated SPR Mapper tests.