Improved query
Views improved
Tests improved
Fake generators improved
Typo corrected
Change in basic test