Added more tests; now watching test folder