fix last remaining tests