fixed typos
removed mockery from tests and changed class names