Work on Element classes and their tests

Change-Id: I4c826f360b1fa09ac5fe9c5d0bbdbdfd3ea400bf