better tests
Merging readme changes