Fix includes, change test prefix_hard to print failures