Adding order test. Cleaning up query builder.