updates on unit tests
Merge branch 'master' into shaunjl