Use subject in spec

This are minor changes to the specs. It does not use global variables anymore and uses the subject block.

I need this for a another pull request (#15).