WIP uniport tests
Get the tests to pass
Move repetitive logic to adminRole