Added ability to specify whether to use the value of FN or the value of
N as an Org heading.
Updated tests to reflect recent refactorings.