mom-81: restructuring tests.