Major reorg of testing dirs, add container-config testing