Estimation bugfixes

Johannes Pfeiferrequested to merge
JohannesPfeifer:Estimation_Bugfixes into master

Fixes two crashes in unit tests

Merge request reports