Adds option to explicitely set tests when calling Module.etest
Remove cruft from etest code