Reenable tests; make includes more coherent