JDBC reformat + JUnit tests