Working on specs
Fixing some query specs