Updates to tests to support running on real servers