Updated README, removed obsolete (?) table references
Fixes to tests so they will run (still fail)