Fixing mock and adding Position class