Reinstate more of the eval tests.