Cleaned up Token db testing with new functionality