Fixing last analysisdriver tests.

[#53967295]
[#52019105]
Merge branch '20130722_ETH_AnalysisFrameworkJSONSerialization_53261073' of https://github.com/NREL/OpenStudio into 20130722_ETH_AnalysisFrameworkJSONSerialization_53261073