Add test and Update README