watchingFile() -> watchedFile()
Increase number of tests to run per core

The tests are mostly spent waiting; therefore this is not a problem.
Make expectations more resilient
More useful message waiting in tests