Added test cases
Improved naming consistency.
Initial skeleton of chapter05.