Still trying to fix the unit tests
Making sure servers shut down correctly
Fixing tests
Fixing tests
Fixing test
I don't even know what's wrong anymore
test push