Add mockery
Update tests