do not merge - working on fixing test