Rearrange spec file:
 * add meaningful hierarchy by nesting
 * DRY out with additional ```beforeEach()``` usages, made possible by nesting
 * organize tests in sane order
Merge remote-tracking branch 'origin/master'