More fixing of tests