Fixed failing tests again