Update test-suite to refer to the new maptests