Merge to work on top of changes for test framework
added documentation for manual tests
Merge renamed tests dir
Merge remote-tracking branch 'upstream/master'