Working build minus JDBC tests