by tstoeckler: Fix tests