Updated ESSearchForm - breaking changes. Added new complementary testcases.