trying to fix magically failing tests ...