Added mock and fixed typos