improve basic test coverage a little
a few tweaks to assist with debugging and error handling
rebuild...