tests codes re-designed
directories re-designed