add (and fix) tests for terminators