Fix broken test & includes.