Some refactoring. UserStatus added. Tests updated.