removed test servers that are not needed
merge testing