renamed the function
did some fix for the smock tests