manufacturing and repack sepreted, test cases fixed, patch fixed