Add a couple of tests
Terminate more gracefully when manual serach is interrupted