(feat) #5 Check which case failed to give a clearer error message
(feat) #5 Series of query test to ensure we havent broken anything