Fix some broken test