Mod5

1. Updated code based on Albert's comments.

2. Completed first half of Assignment #14: "Use Macros and Shared Examples in Tests"