reorganised tests