added testing infrastructure
simplification is the ultimate sophistication