Fix from workmad3 to properly handle current_user and return a stubbed object