20 tests now OK for proper subfunctions