Reorganised the test specs.