working on fixing unit tests