angshu | fixing broken tests