Better error handling in edts-query
Correct return value
Be more permissive in eunit test
Fix expected values