test for static methods and partial mocking
Custom test watcher
Add class missing from previous commits