Made test all pass