Consolidated edm-base a bit and refactored it's uses throughout other elements, also stabilized edm-terms-table (still missing tests for all used elements).