Remove unnecessary files and reorganize test helper