Inline test scripts, add test-watch