reorginize tests