Corrected some tests
Trying to minimize database calls to speed things up a bit.