Merge "Code cleanup of object storage tests"