Work on getting a test harness in place, currently broken