attempt to fix some locally failing unit tests
attempt to fix some locally failing unit tests
part 2