Using double instead mock
Fixed Armando's tests