Updated build, updated tests, toString not final

CPPtoJava no longer has special cases
toString isn't final
main is now in datamodeltestsuite, turning DiffUtil into something that
only has getDiff related methods