Fix and reinstate the recently commented tests.