Updated the logic of the unit test #includes and #defines to be more straighforward

Also updated jamfile