Added tests for sections 2, 3.1, 4.1
Merge remote-tracking branch 'remotes/scott/master'