* Add CORP headers * Improve test * Add unit tests as well --------- Co-authored-by: Keith Williams <[email protected]>