Better tests and updated readme