Updating some test classes
Removing unnecessary dependencies, temporarily removing ES features.