Removed deprecated metric, add additional file predicates
Changed inputFile handling
Adapt/fixed unit tests