Examples in readme and some changes in Tests