adding mock to depedencies and rearranging them