Variable names consistent with Part 1
Simplify the test setup
Flesh out the tutorial