First draft optimized tests