Updated Rspecs for 89% code coverage, up from 75%