Repaired tests for jdbc contribution