Bug fixes.  More testing code.