Fixed specs after the merge