test directory reorg, fixes #100