XD-1385 JDBC Acceptance Tests

Code Cleanup