Package mv from test to main