Add back missing #includes
Re-enable some tests