Re-reorganize again test units tree. Thanks again to @saghul for being (so much) strict (cake now?).