Consistency
Upgrading tests
Started using a test server
Tweak