Correct handling of test accounts