Added MassBalanceTest class
Merge origin/master