Added further test cases for tutorial. Refactored modifier contributors.