-Restructuring for new MUnit formatting