No test content changes - just improvements for readability Signed-off-by: Eric Ernst <eric.ernst@intel.com>