Fixed test server addresses.
Merge branch 'devel'