Removed no longer needed special tasks; handled now by lambdas.
Commented test suite out -> needs adaptations.
Renamed interface for consistency.