Fix two failing tests
First refactor
WatchGroup does not have context any more. It is passed either as a parameter to scope.wathc method or the scope's context is used.