Edit Readme, refactor main testcase