fix tests for new topo runner

@tcolar  Fixed the end-to-end tests.
these package renames seem wildly unnecessary..