Refactor some specs for regitration