Thucidides tests structure refactoring.