Optimization on direct-delivery and test fixes