Move helper to testsute
Remove old files