Fix some strange failing tests