Fixing compilation after some refactoring of test utility methods