Some fixes for the standalone test program.