Fixed Armando's tests