Further progress.  rake test passes.