Fix bug in helper
Mark tests as pending that need to be updated