Did some reorg of the test and implementation process