bring up tests again and make test programs with latest changes build