clean up + finish moving value mapping tests