Updated spec_helper and added a few basic tests
Merge branch 'master' of https://github.com/matiparv/ntd2013-workshop