Modified tests to generate different formats
Upgraded to latest nanopub-java code, some fixes to conversion, updated nanopubs