reorg + addl tests