Refactor User specs
fix merge conflicts