I incorrectly assumed the -c option can be used multiple times with athena. Apparently this is only true for athenaHLT, but not for athena which uses only the last value. Fixing two tests affected by this issue.
-c
cc @smh, @tamartin