proceeding with fixing broken tests