Separated Messages.xml into two separate files, one for the standard client and server and one for the world client and server.
The second change involves moving server dependencies on clients from the testCompile group into the compile group.