Fixed test failures and compiler warnings.

Cleaning up minor issue resulting from Plot3DMetaReader commit.

Change-Id: I3fb35dcfb82d1c30e4508e79876f202524cce028
Merge topic 'fixed-warning-and-failure' into master

5c10e777 Fixed test failures and compiler warnings.