Fix tests pt. 2

We're still skipping a lot