Add integration tests for asset regrouping