Merge "Cleanup OpenStack utils test cases"