almost finished with tests around mapper