Fix Tests that failed