Added test harness and bootstrap