Fixing broken specs

The clever && was not doing what I thought it would have done. So
I am instead breaking things apart. I am keeping this as one test
because I don't want all the DB interactions
Breaking down tests that were not running