Fix failing bokchoy tests and remove extra modal