Merge "Fix pep8 failures in tests for Volume Types and extra specs"