Post factum helper functions and tests added.