Update tests to newer syntax

Move over to newer `expect` syntax, and update descriptions to remove un-necessary shoulds (http://betterspecs.org/#should)