- fixing broken tests