Make user feature specs pass

Also includes a little bit of refactoring.
Using expect syntax