Tyding up test structure (again).