refactor e test