test cleanup
started adding optional header