fix dependencies / test includes / mod includes