Added new tests and changed README