Revise README, refactor tests