Move tests to EL