Refactored some tests and updated Readme