reorg, experimenting with test config, move them back to test directory