Fixing as many tests as I can