Test 2 - Improvements implemented after previous test