fix various tests