Revert "TestBase now uses parent doLogin correctly"

This reverts commit 4623713c133975c6f259bc2734d27949ca07a60f.

Change-Id: I537cb50c2a2c34e824243d34b10534ccb27ef146
Merge "Revert "TestBase now uses parent doLogin correctly""