Fixed check of inherited metadata

* Added cache_in_nova field to list of non-inherited
  metadata
* Moved check for image_type to individual test for
  clarity

Change-Id: Ib34afd98200c7a84ecf8a3339a29b87932ed15e0