Updating tests to use expect syntax

Feel free to reject if you prefer the older syntax, it's very unlikely that that would cause problems - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax has a discussion of the benefits of using the newer expect syntax ("should" monkey patches Kernel, cleaner block statements, and avoids some ambiguity).