Set test server agent to false
Merge branch 'master' into build