Better implementation of Single-user login v2 tests

Change-Id: Ida6a2e00fb76ceade3c2c2492fbc8d6c2f496762