Cleanup

Updated `stop` logic. Updated tests to listen for "finish" event so tests go faster now.