small effort to fix failing tests