some refactor by sharpbites
service incorporated
changes in Cuore Mock
refactored test  by Xavi and sharpbites