fixes for !EXIT mode, add interactive test