Merge "add admin server tests"