Changed tests, added bechmarking
merged the versions, added Main.java that generates output.sql to populate db