fix version number
update readme for running tests
fix conflict