Fix RSpec tests for user signup process
Fix merge conflicts of user signup tests