Add more debug spew to the mapping-test