updated do spec to fix failing tests and updated to spec helper to deal with deprecated method