Fixed tests
Merge remote-tracking branch 'origin/estimation_unical' into estimation_unical