Tests updated to pass on latest DB (2013.04.22).
Merge remote-tracking branch 'origin/master'