Fix existing include tests