reorganize test related files and removed unuse code