[Rebecca/Mercy/Ernesto] fixing broken tests