Change QueryRunner -> JDBCTemplate spring
Fix test
Merge remote-tracking branch 'origin/patch-2'
Fix tests