more work to get tests running.  I think this really closes #27