Moved DISABLE check into shift function.
Expanded unit test to include init and shift functions.
All controller unit tests pass.