Merge "UserLifecycleTests - give proper errors on fail"