Merge "Improve ApiLogin test coverage"