Updated query to include date and price range issues
Removed cache
More tests pass
Merge branch 'test'