SQLAlchemy FTW, and tests refactored.
SQLAlchemy FTW, and tests refactored.