Updated testing for fantastic mapper