Refactor tests for TerminationPoint options