more clean up
revive maptester interface