Further work on testing.
Add watches for running unit tests.