Various bug fixes and CS changes
[UserBundle] Remove failing test