Merging to work on top of test framework changes
Merging to work on top of relative paths change
added documentation for manual tests
rebase from master
cb-6724changed style detail on documentation