reorganize test and code