updating so make and testscript work still need to add all tests