Fixing some modals and tests