Update to correct issues with testing on certain server platforms