Update specs after refactor