add atBegin option to watch task
improved organisation of tests

* nested describe blocks
* improved use of beforeEach/afterEach
add latest dist
consistent 2 space indentation