Cleanup for comments

Move to just "watchClock(duration)", its cleaner.
Cleanup tests to use Fake[Awesome]Async library!