Fix estimate computation and add (enable) additional tests.