[Gardening] More cleanup in Funnel.Es tests

Signed-off-by: chatgris <jboyer@af83.com>