integration test clean-up
Refactored SQL query test class to better separate concerns