Updated shift method and associated tests