Ctrl c fixes

Fix ctrl+c behavior when multiple tests are being run, plus a minor fix in the name of the exception being used.