Make everything work again
Fix tests, because dataset modules generate slightly different SQL
Merge pull request #6 from iblue/bugfix/make-it-work-again

Make everything work again