Tests for UNDERTOW-173