[NRY] Fix tests

417ff0e caused the tests to run and hang/fail, which blocked merges to firmware and runtime. I tried these fixes to make it use the right port, but the test fails: https://rampart.tessel.io/jobs/1100

Going to disable gating firmware merges on the success of this test for now.