Minor fixes.
Removing unrelated comment.
Converting to proper boolean expressions.
Adding papi test using alternative interface.
PAPI test using "active" interface.