Reorganization - moved tests into puz package.