Fix integration test names to make sure they run in maven
Use relationship degree from statistics when possible

o more consistent API for heuristics