Moved to four-endpoint topology (and other test fixes). #6

Closed pthedinger closed 10 years ago