Migrated all specs to using expect syntax to get rid of annoying deprecation warning for should