Opps, forgot to include updated tests