US534 - Fix broken tests