Committing current code, however, the JDBC tests are not working right now, failing because of thrown exception.