working on fixing broken tests