Bounding box is more descriptive than shape, fixed fuel tank unit tests
Bounding boxes are now defined by pixels relative to the image and
better support for multiple bounding boxes for an entity.