Added tests for RecursiveWatcher and more framework tests