Added more tests
Enabled auto-watching