more comprehensive tests
new sql schema