Update of tests, and readme