Fixed Luca's tests.