Reorganize test units. Thanks to @saghul (cake please).