clean up dead code and prints, sanitize imports and whitespace
rework tests to use setup and teardown methods, use borg pattern in WPP, move import function to own file