Edited mash class/test