Changed junit package.
Minor refactoring of ElementHelper.