Refactored unit tests
Added more instructions in README