Workaround to back-compatibility in automake tests harness
Big refactor