Expand test to include header/footer

Add header/footer options to test.