make test user xml_id generic

This avoids duplicating information. Specifically, when I added the user
to the group Account Manager, the xml_id became obsolete. Better to
leave that generic.
use non-admin user in the other yaml file, too