Fixed broken test harness. All tests running and passing now.