attempt to fix some locally failing unit tests