Added test optimizations