Implement TERMINATE as a callable static
Implement some opt ins for tests to back onto real objects
Refactor tests around new listobjects structure