Merge "Clean up ApiLoginTest"