Updates README, cleans up tests