Fixed deployment errors on TestServer