Refactored Order validation in Queries.
Refactored Queries tests.