Refactor
Bug fix for current_user_id tracking used by mocks