trimmed down generated specs and updated user and session specs