Fix various tests