Added some tools and test harnesses