Reinstate some tests