Merge "remove some unused code in nova image tests"