Fixing some unit + integration tests.