Started working on merging ifes testing into es tests.