lots of minor changes to testing. moved some files