Improved tests, updated readme.