re-structured tests