Fixed Broken tests