Add querying to test_happy_path