working on fixing mapper / mapper tests