Add another estimation type.
Remove some tests, which are not yet ready for production