Fix checks on output for test cases
Merge pull request #58 from cyberious/TestFixes

Fix checks on output for test cases
Replace watcher with at_exit for Windows provider

This also removes the catalog_apply_timeout parameter.