Numeric entity consumption implementation started. Tests restructured.