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