Updated the test programs to reflect recent library changes.