enhanced terminated test to end a bit more gracefully