Fixes tests failing due to new modals