Merge "Add query tests for AEP states."