Working version of Test 2 (Dani)