Autoshift: refactoring, higher-level tests