Changed around some depth-based calculations, as they were not being
calculated correctly.
Updated assertions zip.