Style update
Updated to use mocks to guarantee ordering and better prevent unexpected calls