added a couple of notes on tests
resolved a merge conflict