Move file watching + server into separate files.
Add missing specs
Use Sinon for assertions where possible (better error msgs)