fix loads of tests