Remove and pull in test modules
Add elasticsearch to site