Fixed failing tests, updated others