make and test
reorganized