Reinstate old test cases for C4