Test Fixes, Token Updates

* Simpler, speedier token: Once a valid token payload is issued, there's
    actually _no reason_ to validate against the database, _ever_. So
    don't.
* Bring tests in line with new strategy.