Fix spacing and naming in specs
Converting evidences form to be a points form.  Fixing tests.
Cleaning up forms and making things more consistent