Removed AuthenticationMock and combined with Authentication