mod; moved tests into __test__ folders