Even more cleanup and make the tests a little better.  They pass.