Better modal tests