add additional retrys to failing tests
DRY up admin managment tests