Sanity updates

We need to refactor this before merge so it doesn't break our other tests