Little optimization of Test 19