Reinstate existing tests