Bug fixes and better testing.

NOTE:  Commented out Afsin’s test, probably failing due to record
sequence in response.