Make tests more robust

Purge vestigial accounts