Add clean and move files from test to regular