Merge "Add in python unit tests and fix up java unit tests."