created tester helpers and refactored undock