Refactored OTestQuery.* to multiple classes.

This will help with passing the device architecture down from RunTestAction.