Updated README, tests