Fixed shift/rotate, started work on shifter test.