Added new e-test functionality, more modular