Added order to tests to satisfy my OCD
Fixed RT#69438 (failure with HEREDOCS)