Fixed tests, faster maph.