Update readme, fix test and simplify code