reorganizing previous tests