Fix field indices
Revert TestServer changes (moved to branch feature/test-server)