Tidy up spy on onTouchBaseDevice
Fix dependecies between RequireJs modules
Fix InvalidStateError failures in FF