README and test fixes