Fixes watch shutdown issue
Adds preliminary integration test suite
fixup