fixed tavola.include; added/improved test for queries without models
test structure refactoring; some bug fixes