Fixed other failing tests