Fixes issue #25: removed flaky tests.