Reorganized everything to be production in test.