Fixing return mapping, testing