more fixes of tesking