Merge "Remove mocked resources from slice test cases"