Fix rest of unit tests

BI Code now relies on multisite specific code.