Fix sample and implement more complex tests
Before, after and between time queries
Fix read coverall