* reorg. tests