More Unit Tests. Major changes to Element.