Add test service.
Remove unused imports.
Update the sample data used in Java cross test client.