fixing testability and authentication exact method names