Clean up testing for ES.

Setup of integration should not be part of test classes