added additional tests for platform admin functionality
Merge branch 'master' into glens_branch
fixed platform admin tests after merge