Upgrade the test to do something real
Modify the test to add more checks

A number of the routines can still exit internally, which is a bad
thing. Might as well fix that now.