Fixing README, fixing tests