autoshift: more tests and regression fixes