Including some new test programs