Improve testing
Fix README