Testing/Query: Clean up old tests that no longer work (due to changes in API)
Testing/Query: Clean up old tests that no longer work (due to changes in API)

benjaminy/ManyHands,benjaminy/ManyHands,benjaminy/ManyHands,benjaminy/ManyHands