Refactored Element(s); Added tests