working on fixing tests