PMC: cleaner if/endifs for tests