Incorporate changes suggested by reviews, delete obsolete tests.