Merge pull request #212 from mhotan/mh_beta_devel

Udpated some tests