Major reorg of test cases