reorganize main fix tests