Removed dependencies, created test harness.