Fixed specs that were failing after the merge