Fixed most tests with the new EFS changes