more fixing of tests