Update unit tests to cover dual header functionality