Testing fixes

* Force steve to update for tests
* Remove remaining eldred like references