Fix lots of tests