EgineElements test added
conflicts resolved