Fix of includes in new tests.