Remove Srv/Ep tests
Fix and test runner library