Fixes/workarounds for tests.