get the tests to work
Merge branch 'master' into new_master
Revert "fixed spec_helper file"

This reverts commit 4d44457a8f9b4f8d0c0c76cc49a18bd1f541b9c0.