working on db tests
Merge branch 'master' into limit
Merge branch 'master' into limit
fixed limit and offset for queries across tables