Added 2.0 support, removed console test harnesses