Fix and unblock some tests