Fix two long-failing tests