Remove references to test harness and refactor