Simplifying filtering in ApiConsistencyTest

Fixes #802