Spec cleanup

- cleaned up the spec_helper
- removed the requirement for spec_helper in all specs as it is not needed due to an option in the .rspec file