Updating OLAServer to match TestServer