Merge Roel's changes to the annex60 branch

This will update unittest.py with the changes needed for JModelica. It also cleans up single and double underscores.