refactor some specs