updated test mov and cleanup