Modified to use the TestWatcher. #109

Please review #109 .