Renaming forwarding include file for naming consistency
Adding test for parsing affinity options