fix errors introduced my last few commits, add more tests.  Public tests do not pass yet.  Private tests pass