fills in a few more tests, refactor how emails are sent (need to do templates and such in there soon)