Small refactoring
+ Changes to expected error codes due to Crowd migration