Fix lots of tests failing