Updated functional tests
Make functional tests use servlet protocol