Tests can use both local and remote elliptics

Removed unused code