Tests optimized