Working Unit test, reorganized packaging, refactored common patters around values collections