Update README and clean up spec_helper
Update specs