ENH: Better depth weighting, inverse testing

From #343.