Added more to MetarData.  Moved Unit Test to MetarData class.