Rewrite specs and replicates #2 changes

This updates the spec syntax to use 'expect' instead of 'should'.
It also replicates the changes made on #2, as it was made months ago and the build broke.