Fixing broken tests:
  - Fix alignment issues and simplify program header logic