reorganized files
fixed make_test