Refactor testing.
Update Readme.