fix the test
put read me changes in
fix readme merge conflict