Reorganised tests