More refactoring of WIWAPIObjects.
Interim commit with some shift tests and methods complete.