Refactored to use a layout template
Refactored test descriptions for clarity