1162be9 remove all subs in the test files