I disagree with these changes: The test should check that a normal manager can't lockout himself. I know that this also is valid for the "new" admin, but the admin maybe has some special behavior (maybe only in the future), so I think it would be better, that the test does not expect "too much". (Maybe it is just an idea of test design. ...)