test driver and scenarios
minor cleanups
protocol fix