Added back old tests in the new structure.