Reorganizing also tests