Tweak test harness, project tidying, use package rather than reference