Added elements, and tests