Reorganised calls so that require/use tests pass
fixed order change of mock due to lib order changes