Updated deprecated .should syntax to expect...to syntax for all tests