Rewriting more tests without ginkgo
Attempting to fix server integration tests