Re-organization + test of small logical functions