avoiding transitive includes in tests