Changing README and fixing tests.