Merge "Add basic admin tests for Aodh"