Unblock tests cases that passed

Done