Change in mom[master]: Making the tests optional