Test suite fixes

First commit adds the missing annotation on a manual mode test.

Second commit just cleans up the test runner a bit and verifies manual tests are tore down properly.