improve tests (for terminations)